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

[automerger skipped] Merge "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into sc-v2-dev am: eeba594f -s ours am: 2900f3f3 -s ours am: ac88e86f -s ours am: ec43e46d -s ours am: aec806e2 -s ours

am skip reason: contains skip directive

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



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