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

Change-Id: Id87a35597db82345e564fd4d92500b8dacdc0c23