Merge changes I10eb8818,I8f2152e2 into main

* changes:
  Ignore failing tests under com.android.settings.location
  Ignore failing tests under com.android.settings.wifi.details