Merge "Revert "Allow SUW to change dark theme"" into rvc-dev am: 1d555b86cb

Change-Id: I24597f61e6c7a2cae2d27cf733c7f29ee79ffde2