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

Change-Id: Ie36b95d76d53076c4d35a5973c260dd98c5e0693