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

Change-Id: Ib54b2bafcf87a4f27e6a541a4cde0b01c41780b0