Merge "Revert "Allow location provider to deep link into permissions UI""