Merge "Enable SHOW_WEATHER_COMPLICATION_ON_DREAM_OVERLAY and...

Merge "Enable SHOW_WEATHER_COMPLICATION_ON_DREAM_OVERLAY and HIDE_SMARTSPACE_ON_DREAM_OVERLAY for Droidfood" into tm-qpr-dev am: ed33fcad am: 153edaa9 am: a14cb285 am: c69bf231

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



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