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

* commit '10ed7de7ae1ef1ac10b596c688182642acaca674':
  Default system theme should be DeviceDefault

Change-Id: I7cbcecaed22b504ce64c7b279df8f7c1d7bc35e8