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

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

Change-Id: I4206027d5b11f8e6247d75acf0c8ba6e8ff90833