Merge "Redact location info from PhysicalChannelConfig" am: 92f92c7ce0 am: 8dd68b73cc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644103

Change-Id: I7c92bd310f0eca7848daa0851be3a0511ef6d04f