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

Change-Id: Ie75ce644bf137ca557c62c4ee17fb2b7ecb4d182