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

Change-Id: Ia89971c39cf37618ef7875d584e99f9f57a9a37a