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

* commit 'f60281f3b5e3f8636d9cf266685605e665560ea6':

Change-Id: I29696c212eb8d90c9a49d09021ce5bc81748dcae