Merge "Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev am: ec43e485" into oc-dr1-dev-plus-aosp