Merge "Allow direct-boot aware activity to show before profile is unlocked"...
Merge "Allow direct-boot aware activity to show before profile is unlocked" into nyc-mr1-dev am: b0c59bb5
am: d6d2fbdf
Change-Id: I92ea621af49a34fb9421638d2d760d7340f23073