[automerger skipped] Merge "Fix bypass BAL via LocationManager.requestFlush"...

[automerger skipped] Merge "Fix bypass BAL via LocationManager.requestFlush" into sc-v2-dev am: 535e64b9 -s ours am: bc7ae73f -s ours am: 2e7fbb59 -s ours

am skip reason: skipped by user katemontgomery

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21127326



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