Merge "Add flag for removing flag resets in RP" into main am: d6aaa36d95 am: cf93082309

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

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