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

Change-Id: Ie1638d6e16352dc7bda6e4dfce0ecfc1329f6187