am: f46e776 * commit 'f46e776b063c66a06aa1ccc263ea3b75da43e874': AfW custom lock screen message - API polish Change-Id: Ic9fa7d92d7460dc710bb06338e629d74d533d184
am: f46e776 * commit 'f46e776b063c66a06aa1ccc263ea3b75da43e874': AfW custom lock screen message - API polish Change-Id: Ic9fa7d92d7460dc710bb06338e629d74d533d184