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

Change-Id: Ia1ac8442a6d8a437d99b9e58b3228408a23b9dea