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

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

Change-Id: I6a6c35bcd6ba3bafc311974120f5393120a4c1f4