[automerger skipped] Merge "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into sc-v2-dev am: eeba594f2c -s ours am: 2900f3f3f3 -s ours am: ac88e86f72 -s ours am: ec43e46d8a -s ours

am skip reason: contains skip directive

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

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