Merge "Create a flag for rescue party flag resets" into main am: dc21a049

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



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