Merge changes from topic "presubmit-am-34a8ba0b26b74d1daf2868b91d148909" into sc-v2-dev-plus-aosp

* changes:
  [automerged blank] Use TDA for background color instead of new color layer 2p: dc4296e335
  Use TDA for background color instead of new color layer