[automerger skipped] Merge "Add HAL converter for PhysicalChannelConfig" am:...
[automerger skipped] Merge "Add HAL converter for PhysicalChannelConfig" am: 6f319694 am: 8d922bca
am: 80e212de -s ours
am skip reason: change_id If014c1f47c252b3c1eb7f6fa4e0600299aeecc4e with SHA1 61b6c1f0 is in history
Change-Id: Iec5588928d759203349c35009a0fec66c3eb321f