Merge "Hide blocking pay phone option use carrier config"
am: c365007e5f

Change-Id: I4385f33d658a394d80e0b0722faf5ca12df940f6