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

Change-Id: Id5d20f5c4096bd68b20214fcb33a9eeff280ba9c