Merge "Add PhysicalChannelConfig."
am: c584d2772d

Change-Id: I3377d0502e74e58aed9f2cba746993130a4469dd