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

Change-Id: I36db47a9d2b3c7924e80eb980f2eaa6a33ecfd46