Merge "Merge "Fix bypass BAL via LocationManager.requestFlush" into sc-qpr1-dev am: 8980004b5e am: 8be88110e8 am: a5a13ed200 am: 7eb3630796" into tm-qpr-dev am: bf04c16156

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

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