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