Merge "Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf695" into tm-mainline-prod am: 1689a6bb

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



Change-Id: I0a0558cdded102292ae9c966053d993d8cccaeab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>