Merge "Add PhysicalChannelConfig." am: c584d2772d
am: 3deaafd8cd

Change-Id: Id6ec6d693ec05d363b2847d0e4eee72fea24aef9