Merge "Update AndroidKeyStoreMaintenance framework API" am: 8c34efd29a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1950401

Change-Id: I1b23442c2a7e5bce0659be286202ce571c4566b3