Merge "Merge "Remove redundant checks that stop updating systemUI when entering dream" into rvc-dev am: a3a29967 am: 02e41c15" into rvc-d1-dev-plus-aosp