Merge "Implement physicalChannelConfig framework/base" am: c291d32338
am: 40830b3d4a

Change-Id: I57ea9285bc9fb2e71095906b6e4ac3666f922563