Merge "ServiceStateProvider:Enforce location permissino check with targetSdkVersion R-"