tree cea4b8fa4bf9b3c7efcc14c4fc04ea24b6c1ffca
parent 9a8b9356d1670f32477ef1a8e27cdd91a9075a78
parent 18c00007b700c41cbc311f45ef133749d3eee1ee
author Lin Yuan <linyuan@google.com> 1654204018 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654204018 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6 am: 95d21bc12f -s ours am: 18c00007b7 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386

Change-Id: If3bd1866990498d776eea19a1bdd5e33741bf4af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>