Merge "Merge "Remove old logic from tinting prototype" into qt-dev am:...
Merge "Merge "Remove old logic from tinting prototype" into qt-dev am: 60f7cef6 am: 3ff9d36c" into qt-r1-dev-plus-aosp
am: 6c6bcb7d
Change-Id: I3d985cd6a683b098e258fea5790a07b200607f6f