Merge "Add theme variables to SysUI dump" into oc-dr1-dev am: 4451b6ae19 am: 3a5550a3be
am: a5dbda0b36

Change-Id: Ia80a4e6197c02d34ad4069a87a63919ac7cc7de6