Merge "Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev am: 9282193c" into oc-mr1-dev-plus-aosp