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 am: f330bc3f

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

Change-Id: I404f963691cc14bae827bd22cac0494f75aee426