Merge "Merge "Revert "Add elevation to dream home controls button."" into...

Merge "Merge "Revert "Add elevation to dream home controls button."" into udc-dev am: 37b8ca63" into udc-dev-plus-aosp am: c13bec2a am: 58f6d421

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



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