Merge "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into tm-dev am: 205ffa2a8c am: 690d232e95

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

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