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

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

Change-Id: Ic69c6ec93cfaf19d179f4ed488ca242a9b451692