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

Change-Id: I340207420e0811c74751a96dc30e929a411ea207