Merge "Fix bypass BAL via `requestGeofence`" into rvc-dev am: b71dcd28fa am: 7044f0061c am: 55acbf1c11 am: bb7386f9eb am: 2219964164 am: 426efc71db am: 380e97982e am: 2381699e9f am: 7c18d5f4ee

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

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