Merge "Fix sleep during launch animation resulting in a unlocked device." into...

Merge "Fix sleep during launch animation resulting in a unlocked device." into tm-dev am: fc94de68

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17016402

Change-Id: I99b2011cde46dc73c2ddf2c0d564a60960c0fa0d