Merge changes from topic "presubmit-am-fd27274888ea401a9bf6dfb886a22ff1" into sc-qpr1-dev am: f7dc445cb1

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

Change-Id: I43061d394fd70d8d729471a60fe807e3822272e5