Merge "Add cross-links between FINE and COARSE location permissions. bug: 25371600"