Merge changes from topic "presubmit-am-8c071f5a90f947fb9f84d6459ecc41a9" into sc-qpr1-dev am: 9373d8baca

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/15806954

Change-Id: I55d896c300ca5cbc8278b4f5593a0bcb442782a3