am 040fc2a8: am 25e7b9fd: am 9e81694f: Merge "Propogate colorControl* attrs upto the framework on Lollipop" into lmp-mr1-dev
am 040fc2a8: am 25e7b9fd: am 9e81694f: Merge "Propogate colorControl* attrs upto the framework on Lollipop" into lmp-mr1-dev

* commit '040fc2a83b342d5ddb0f3b2e54a2b20acddbb153':
  Propogate colorControl* attrs upto the framework on Lollipop

AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,AndroidX/androidx,AndroidX/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,aosp-mirror/platform_frameworks_support,AndroidX/androidx,androidx/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,AndroidX/androidx,androidx/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx