Merge changes from topic "presubmit-am-00597cf6b7ff454d8c33dfbca2229801" into sc-qpr1-dev am: e7ab2e7a1b

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

Change-Id: I21a148aa360696af935b0ce6d7acb1009d79b627