Merge "Add back elevation to quick settings" into nyc-dev
am: ca2ce9b74a

* commit 'ca2ce9b74aba25692762fa625a1fd2894a62534b':
  Add back elevation to quick settings

Change-Id: Ib3d57e728a635d9c6aaec539cdadd84bf57b155c