Merge "Fix bypass BAL via LocationManager.requestFlush" into tm-dev am: 41fca95ca1 am: 4b72bdc44f am: a71554ec74

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

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