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

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

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