Merge "Add feature flag for Smartspace date/weather decoupling." into...

Merge "Add feature flag for Smartspace date/weather decoupling." into tm-qpr-dev am: ad829f2c am: e9c64702

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



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