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

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

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