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

Change-Id: I8f9bfce21f40607f95eee57fed835e35abbd02c6