Merge changes from topic "fbe-wipe-no-reboot" into main am: fd9335cd am: 4073ee27

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



Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:05b1440e06c84212b4353be7f5cbe97fd1bccafb)
Merged-In: Ia6d83f7582ce0d976c857c7318a1f9ed1fe3bae8
Change-Id: Ia6d83f7582ce0d976c857c7318a1f9ed1fe3bae8