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

Change-Id: I3816712a499e1453a286650ace3bfa1496874b03