Merge "Update AndroidKeyStoreMaintenance framework API" am: 8c34efd29a am: be201a0ed5

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

Change-Id: I5a6605026eaf1757975f30ac5f819c317ad61df4