tree 7ce919c03db8667423aa5d281de6f34deb596342
parent 12a9212ac102893f6ff4291e5aa024030cbf7682
parent 22d50012b0c8b39f02e3a4ce834cbbfde63e15d8
author Eric Biggers <ebiggers@google.com> 1570476437 -0700
committer android-build-merger <android-build-merger@google.com> 1570476437 -0700

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

Change-Id: I97a1990aa2f0bdaf2a622555774b737bfc6d26ab