[automerger skipped] [automerged blank] Use TDA for background color instead of new color layer 2p: dc4296e335 am: 38bb1b2fcd -s ours

am skip reason: Merged-In I57fa88c6f45adca9e3301b39e868bd127644b76f with SHA-1 975e9ab45b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16182190

Change-Id: I794be621ec1317986971ea26754e104cede049cb