Merge "Merge "Add occlusion logic to OverlayViewGlobalStateController and CarKeyguardViewController" into rvc-dev am: 8920f765 am: 36c1a6f6" into rvc-d1-dev-plus-aosp