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

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

Change-Id: I4e57bea4c541582b13a8496a1570abfa41013825