Merge "Add bg location access for companiondevicemanager"