am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"

# By Anju Mathapati
# Via Android Git Automerger (1) and others
* commit 'f0bf29df0cff4b7e370b7c329de92e90a4bab194':
  frameworks: Display missing text on SimUnlockScreen