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

[automerger skipped] Merge "PhysicalChannelConfig.Builder change IAE to error logs" into tm-dev am: 6c1c90f1 -s ours

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

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

Change-Id: Id6d30646016f6e46e4361f4dd8e742115ebcec6d