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

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

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