Merge "Merge "Store ambient display suppression state in memory." into rvc-dev am: 1399825f am: 48640216" into rvc-d1-dev-plus-aosp