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

Change-Id: I9edd61cddf3a873f3c95ed5dbf4c35943f97b7b0