Merge "Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am: bc3c1d01 am: 2674ad2e" into oc-mr1-dev-plus-aosp