Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
am: bc3c1d0170

Change-Id: I598d82fcd14702151a924dd481fa067613c76b0e