Merge "Add occlude/unocclude support in keyguard shell transitions" into sc-v2-dev am: 1f1bf948

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

Change-Id: I496c4fc42a0fe350e4f197556eba8b0d90f84cde