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

Change-Id: I18f59c0d2ab20ae38c29bc6135920dfe4e8cc647