[automerger skipped] Merge "PhysicalChannelConfig.Builder change IAE to error...

[automerger skipped] Merge "PhysicalChannelConfig.Builder change IAE to error logs" am: 64eae25b am: d6917c0a am: d4d21706 -s ours am: 812ecf0e -s ours

am skip reason: Merged-In I4e777e31b005b30876a72c1e2efe57b86a1ffc9b with SHA-1 9e4b6e19 is already in history

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

Change-Id: I6bfb501e27ed1a09717cfee1456ec38f3b5931ee