Merge "Update documentation for currentPhysicalChannelConfigs()" am: 115484976b am: 501a334235
am: 1505331206

Change-Id: Ie29ba4839bded9b8ae7fd56ef39d42a236f2c355