Merge changes I351afd8c,I6f98354d into sc-dev am: a6a2f1039d

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

Change-Id: I711501ae72f2a7b827c26643859f00fc046b0ce9