[automerger skipped] Merge "RESTRICT AUTOMERGE Delete keystore keys from...

[automerger skipped] Merge "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into tm-dev am: 205ffa2a am: 690d232e am: 4583dd90 -s ours am: 05fcd6da -s ours

am skip reason: contains skip directive

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



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