Merge "String call_barring_change_pwd_description_disabled remove full stop" am: 424402c121 am: ae4c3ffa29

Change-Id: If7e9f3d1aab59f32bada47bf31d3677669b5446e