[automerger skipped] Move color and display info into DecorProvider am: f1fc5d21b1 am: bfbdafa397 -s ours
am skip reason: Merged-In I1fdcbe4c5e8ee0a54eba03f59b9066e76e5c9a03 with SHA-1 3353759edf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19575672
Change-Id: Ic4968c78465ca277ac42d88e8060a9126d9c1e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: