Merge changes from topic "presubmit-am-23ccfb9e7cd24957ad21e80dbc462c4e" into sc-qpr1-dev am: bc0141a2fe

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

Change-Id: I132a74eeb0485b75c06ae80da39eb9459e9a144c