[automerger skipped] Merge "add registrant for PhysicalChannelConfig change"...
[automerger skipped] Merge "add registrant for PhysicalChannelConfig change" am: db3d3d8b am: 7a4618ef am: de3a968f -s ours
am skip reason: Change-Id Id1d9a03d48239b9c8493dd389013f2c5edec8436 with SHA-1 efb18f2b is in history
Change-Id: I4875516adf0e0c103054ffc8c0ea4c333f2239fb