Merge changes from topic "presubmit-am-c1fd0fbba21041f7a9fc4fccd2ed61f5" into sc-qpr1-dev am: 0b87b86be1

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

Change-Id: Ifa5854570dbb01cb3863511f63df77aebe926cde