Merge "Unify keygaurd occluded status variable." into sc-v2-dev am: c2d84da6ee am: 9ca9155783

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

Change-Id: I7690afbbcc913fc4f8d95a52295a83e9fa791275