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: 07d71516

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



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