[automerger skipped] Merge changes from topics "sap_lohs_toWifiConfig", "wpa3-enterprise-rvc-qpr-dev" into rvc-qpr-dev am: 78248336 -s ours

am skip reason: Change-Id I6afba22e4081ba58884ffd1b560b81b1e9960132 with SHA-1 43a326cd is in history

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

Change-Id: I566313c9977b6aae3d80a51c5cd765bdde1bc69c