Merge "Fix the TalkBack say wrong sentence after sim unlock" into pi-dev am: c7292ffae3
am: 96788ce1d8

Change-Id: I52681f9474fbe5f44681faa1515fb2c0d45676ac