[automerger skipped] Merge "[PhysicalChannelConfig] UL's frequency should not...

[automerger skipped] Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" am: a6f81885 -s ours am: 7a293d62 -s ours am: 76b9c037 -s ours am: d50ec2fb -s ours

am skip reason: Merged-In I1225a1429ff77b33c54af0dfce60a8739494e47a with SHA-1 e5225ba8 is already in history

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

Change-Id: I745adc6d26134991f26d16f9fe8975ff3a096c42