Merge "Merge "Dismiss docked stack if an activity is shown on top of the lock...
Merge "Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev am: 5d6a218d am: 3b030934" into nyc-mr1-dev-plus-aosp
am: 6dea8795
* commit '6dea8795':
Change-Id: Ic6f68b99b8bf840b86096c69b59687812ec40dcc