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

[automerger skipped] Merge "Update the java doc of AndroidKeyStoreProvider#getKeyStoreOperationHandle to support Signature object" into sc-dev am: b4e9cab1 am: 786427f1 -s ours

am skip reason: Merged-In Ie65dcfe96f3bb00cc9af4d49e4e1d1f57bde438a with SHA-1 507a653a is already in history

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

Change-Id: I72ed4fb0572e594936f953fe095e419c178d542c