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

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

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