Merge changes from topic "fscrypt-key-mgmt-improvements" am: 22d50012b0 am: de5c9ad178
am: 5a7cace2fc

Change-Id: Ibb446d5d4daa38ebd4ce8ff52fb07a34a75a179c