Merge "Add theme variables to SysUI dump" into oc-dr1-dev am: 4451b6ae19
am: 98c63ca9ac

Change-Id: I2264136dea35f9eb4d08c0a43e591c06d863c2ba