[automerger skipped] Merge "Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into 24D1-dev am: aa1dc13087 -s ours

am skip reason: Merged-In I5eb8e97f3ae1a18d5e7e7c2c7eca048ebff3440a with SHA-1 0d00031851 is already in history

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

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