Merge "Deprecating flags and settings resets in RescueParty" into main am: 25a6795891

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

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