Merge changes from topic "presubmit-am-d8d9a46e97b94e3b95c3e4cabc26dd1d" into sc-qpr1-dev am: aa1fe08f17

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

Change-Id: I53b1d812e87f1efe40709e13eaf1bc546ba43897