Merge "Merge "Merge "Add theme variables to SysUI dump" into oc-dr1-dev am: 4451b6ae19 am: 98c63ca9ac" into oc-mr1-dev-plus-aosp am: 84f7cc3a21"