[automerger skipped] Use TDA for background color instead of new color layer am: 975e9ab45b am: 42b52280e7 -s ours am: 9212b4e461 -s ours
am skip reason: Merged-In I57fa88c6f45adca9e3301b39e868bd127644b76f with SHA-1 93850bd00d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16904913
Change-Id: I3db143289549c78ffc29bab89c73e513e0bcbd95
This commit is contained in: