Merge "frameworks: Display missing text on SimUnlockScreen"