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

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

Change-Id: Ie505875b83c1151a12e93c7deb6eec400a3ceda5