Merge "[automerger skipped] Merge "Update the java doc of...

Merge "[automerger skipped] Merge "Update the java doc of AndroidKeyStoreProvider#getKeyStoreOperationHandle to support Signature object" into sc-dev am: b4e9cab1 am: ee1eedbc -s ours" into sc-v2-dev-plus-aosp am: 20e92b79 -s ours

am skip reason: Merged-In Ie65dcfe96f3bb00cc9af4d49e4e1d1f57bde438a with SHA-1 49a5bb20 is already in history

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

Change-Id: I7c3e80cf88448fa09bc781b8a9270b67b79332ce