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

Change-Id: Ic5587ed1d9d4932133a2017c1cf9fc4a5373a2ff