Merge changes from topic "am-8a1c2556f29f4cbaa6945d3156a205b3" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552 am: 95d21bc1 -s ours am: 18c00007 -s ours am: 148b2d99 -s ours am: fd627f9c -s ours am: 729c5d04 -s ours am: f59cba01 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a55 am: d78ed7aa -s ours am: 36b5a2c8 -s ours am: 9a8b9356 -s ours am: 98c2b7b8 -s ours am: 5912455b -s ours am: 4e92ed39 -s ours