Merge "Fix bypass BAL via `requestGeofence`" into rvc-dev am: b71dcd28fa am: 7044f0061c

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

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