Merge "Revert "Add elevation to dream home controls button."" into udc-dev am:...

Merge "Revert "Add elevation to dream home controls button."" into udc-dev am: 37b8ca63 am: 296db227

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089776



Change-Id: I63de83e4aca49b00160792b7c59b36929254d5d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>