Merge "Assist: Only call lockscreenShown when it is actually shown" into...
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am: bc3c1d01 am: 1a9c0c37
am: e4f542fa
Change-Id: Ia932db1b7a924c954e38890fe36da66071f72c10