Merge changes from topic "presubmit-am-5482901e1a9f43f99964b507e3ad4959" into sc-v2-dev-plus-aosp

* changes:
  [automerged blank] Don't set background color if TDA doesn't have a valid surface 2p: 62f69423c5
  Don't set background color if TDA doesn't have a valid surface