tree 4a77408dbd7d4605ec2b611d993874b0c3e85472
parent d8f1e31bb448e778da57c96d91c7c9b954f607c7
parent 25a67958915c36147faad67836fe383fa9057582
author Alexei Nicoara <ancr@google.com> 1720018516 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1720018516 +0000

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>