[automerger skipped] Merge "Make createLocationInfoSanitizedCopy as @hide."...

[automerger skipped] Merge "Make createLocationInfoSanitizedCopy as @hide." am: ea4d3a95 am: ff485dd4 -s ours am: 2cc1ab35 -s ours am: 2afae160 -s ours am: c926f0dc -s ours

am skip reason: Change-Id I65dea196ab80aec96b6b35edcc0059cefc2f1b43 with SHA-1 0ca109c0 is in history

Change-Id: I52240554815875daf0bdb5e836a4eecf8b96563a