Merge "Add Call Barring UI" am: e40b7baee1
am: 2e4305434a

Change-Id: Ibd137282548e68e94fc7ce622d0823bca625a7e9