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 am: 07d71516 am: 6dd6ee29" into udc-qpr-dev-plus-aosp am: 393a3a06

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



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