[automerger skipped] Merge changes from topic "mainlineVersion" into rvc-qpr-dev am: 59d3999893 am: b15ab47491 -s ours

am skip reason: Change-Id I3eb878145a761452ddcfdd0b5c424e78212fc799 with SHA-1 f14b1a7a07 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12495216

Change-Id: I074e63b0b456decd959698ddfefa21a90e1ae511