Merge "hikey960: enable File-Based Encryption" am: 6cb5ca28f1 am: 30a18580e8 am: 132cfd22d2 am: 5ec4f578b5

Change-Id: I573b589abe238d7c4108b2573901942cafcf9efe