Merge "Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into udc-dev am: a132b5bfd9

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

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