[automerger skipped] Merge "Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into udc-dev am: a132b5bfd9 am: 2ec6bb20c8 -s ours

am skip reason: Merged-In I5eb8e97f3ae1a18d5e7e7c2c7eca048ebff3440a with SHA-1 7392c65e1f is already in history

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

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