Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb am: 192a8c4973 am: 97be8864e5
am: ec9f41356c

Change-Id: I7cd3a82a73707b1f61c82897c0e7fbc63f33d226