[automerger skipped] Merge "Disabling RescueParty flag resets" into main am: feabe05207 am: 549f749003 -s ours

am skip reason: Merged-In I84bd4c421dd1ca3a0f63a2d86f740a49209212be with SHA-1 dbd7dec662 is already in history

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

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