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