Merge "Sanitize owner UID iff owning app does not have location permissions." am: 23990829 am: 8b18b535 am: 66202838 Change-Id: I9b8fb3ff8d907ecda918a8a926edb133b742c8f1