[automerger skipped] RESTRICT AUTOMERGE Resynchronize QPR flags with Main am: b3997ca352 am: 48b3a5adf2 -s ours

am skip reason: subject contains skip directive

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

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