[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "wifi-rvc-qpr-dev-cherry-pick-to-mainline-prod" into mainline-prod am: 05f11c46 -s ours

am skip reason: Change-Id I875d0d0584d71fe6dd3fedc8f5371e0b5ed2e5e5 with SHA-1 08744836 is in history

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

Change-Id: Id11afb712bcfc02a5350067c1e62c224775eafa0