Merge "Revert "Fix sleep during launch animation resulting in a unlocked device."" into tm-dev am: 0f635779 am: e0124ae0

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

Change-Id: I6b20dcc1458214f4f023cf2286ddd79219e5227a