Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7ae
am: 83e714bcc9

* commit '83e714bcc9a72d7f74fbee76065e68cd3e93f882':
  Default system theme should be DeviceDefault

Change-Id: I9aba0cd74d6cde865489b6204ba2313ade5b6881