Merge changes I4a0bd0e9,Ia1619e6d into main

* changes:
  Write ColorStateList to proto
  Write RemoteViews caches to proto