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

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

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



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