Merge "Fix bypass BAL via LocationManager.requestFlush" into sc-dev am: bcbdcb0d07 am: bcbd1517f3 am: f96c3f1e3c am: d7a0154f21

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

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