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

Change-Id: I91d75a6365cc629d10bfaaebdba3faf6ead646af