Merge "Enable SHOW_WEATHER_COMPLICATION_ON_DREAM_OVERLAY and HIDE_SMARTSPACE_ON_DREAM_OVERLAY for Droidfood" into tm-qpr-dev am: ed33fcadf5

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

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