Merge "Merge "Fix QS lock screen animation" into oc-dev am: aa2286e4 am: a86cc709" into oc-dr1-dev-plus-aosp