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

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

Change-Id: Ic784f4803ee59201709766171b41cbec4c43abbd