Merge "Sanitize owner UID iff owning app does not have location permissions." am: 239908298e am: 8b18b53599

Change-Id: Ib99af41b78dc9539f2a553231e13549d348b72db