Merge "hikey960: enable File-Based Encryption" am: 6cb5ca28f1

Change-Id: I2fe7feb186403cc3572bbd62f77ae0f4c4edce21