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

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



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