Merge "Push flags from top-level TypedValue into ComplexColor changing configs" into nyc-dev
am: f068cff176

* commit 'f068cff1761a2876587caa7ca6978a848198439a':
  Push flags from top-level TypedValue into ComplexColor changing configs