[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: fee0952d -s ours am: 0b5a7a40 -s ours

am skip reason: contains skip directive

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



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