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