Merge "Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am: feb69bf5 am: 38250275" into oc-mr1-dev-plus-aosp