Merge changes from topic "presubmit-am-95ddcbcac6a14fb08b5f072af1edec56" into sc-qpr1-dev am: 7cb0eab9ac

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

Change-Id: Ic7a0fff7912ff8668313793834fd6fc1e38936ab