[automerger skipped] Merge "Implement physicalChannelConfig framework/base" am: c291d32338 am: 40830b3d4a
am: ece8fcc0c7  -s ours

Change-Id: Iee2c572b109d1d62163e9293bce229222437444f