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: I93c64f9ba48345c9e41fa93a15beced967c0865e