Merge "Re-prioritize keyguard visibility animation logic" into sc-v2-dev am: 3abdb0179e am: 55bd4fe70a

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

Change-Id: Ia18a8fea79f50eb91644e3d49d28461415e0bdb5