Merge "Adjust Lock screen message for better accessibility." into pi-dev am: 1b242d24ca
am: 687b7aecec

Change-Id: Ic8afe6017cb049813070e8b271d624795920201c