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

Change-Id: Ie5876d063d7440aacc57d48cb4573798303910ea