Merge changes from topic "presubmit-am-b070f875672c43159d503c67cdf487db" into sc-qpr1-dev am: cf72364b99

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

Change-Id: I635e6ed94e12e58aabd11ec9a47e1dfc977781cb