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

Change-Id: I8a03b9a31b27b88e10f64a4707e010b1db7945ca