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

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

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