Merge changes from topic "presubmit-am-fee90d34a2d84315bebfee0a87a96151" into sc-qpr1-dev am: 63cb10df26

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/16518451

Change-Id: Ic5839cb0d2c7dbf8a170e5c4c8bb1d28bee0fbcc