[automerger skipped] Merge "Expose sanitizeLocationInfo as SystemApi" am:...
[automerger skipped] Merge "Expose sanitizeLocationInfo as SystemApi" am: cc2956a0 am: 0df57915 am: 98b586aa -s ours
am skip reason: Change-Id If1cb6519a3da60ff0afab001c2804aaa70923dac with SHA-1 1af97c9d is in history
Change-Id: Ia74e4f9f46f6ff166c531e54aa2b8e009b1fadce