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

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

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