Merge "Keyguard Unfold" into sc-v2-dev am: d3fdb87c77 am: 3986c77624

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

Change-Id: I568eef781f4b919b5fd1e11e9353fdce99b5d0af