tree 0a100e4837e4b66888c00119ecfd1f4e161f2dae
parent 5912455bf029bfcce97a869a62d099edea3cca2e
parent fd627f9c1d8d43c6727c01b02d7b88f4f048f269
author Lin Yuan <linyuan@google.com> 1654206022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654206022 +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: 148b2d99ba -s ours am: fd627f9c1d -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: Idc07e5d093123a6d191e554154ac0c61dfa2c9d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>