Merge "[Telephony Mainline] 1. Move the functionality about block number into the calling locations. 2. Follow coding style: 100 character per line."