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

Change-Id: I1162ca508d031f8c93db4cf1e79e5fce53f67e20