Merge "Merge "Fix bypass BAL via LocationManager.requestFlush" into...

Merge "Merge "Fix bypass BAL via LocationManager.requestFlush" into sc-qpr1-dev am: 8980004b am: 8be88110 am: a5a13ed2 am: 7eb36307" into tm-qpr-dev am: bf04c161 am: ec52ca82

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



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