Merge "Fix bypass BAL via LocationManager.requestFlush" into tm-qpr-dev am: afbbb8ae44

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

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