tree 1963ffb3e4bbcc4c765cbc2fc15a7ee1d666f0d4
parent aeab9be2c3cf61357000b8f978f882a808e84a18
parent 02ca4012360d971b8ccb9526e32a69e1ba304b54
author Lin Yuan <linyuan@google.com> 1654204002 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654204002 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a am: 36069908ce -s ours am: 02ca401236 -s ours

am skip reason: subject contains skip directive

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

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