Merge "Fix bypass BAL via LocationManager.requestFlush" into sc-dev am: bcbdcb0d am: bcbd1517

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



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