[automerger skipped] Merge "String call_barring_change_pwd_description_disabled remove full stop" am: 424402c121 am: ae4c3ffa29 am: dd71587dc6 -s ours
am skip reason: Change-Id I296007ae9822c591c1ff67a63af3b5ffd020bd37 with SHA-1 cce7ce998a is in history

Change-Id: I5fb4081a791bb4cd9b33b6276de3ee7594eef78f