Merge "Sanitize owner UID iff owning app does not have location permissions." am: 90b14db3b2 am: 69e9dd54d5

Change-Id: Ib99af41b78dc9539f2a553231e13549d348b72db