Merge "Show password dialog when setting Call Barring without UT"
am: 35456ceffc

Change-Id: Iefb408099266c2a9a50895f69de7c8dd6dc0c084