Merge \"Merge \\\"Fixing issue with screen pinning screen not showing for...
Merge \"Merge \\\"Fixing issue with screen pinning screen not showing for secondary users.\\\" into nyc-dev am: 9a75ed7a am: 511562ee\" into nyc-mr1-dev-plus-aosp
am: 96c49958
Change-Id: Iea20f4afc2bfbc50f585970817f645ea2a43d630