Merge "Allow inactive recommendation card and set timeout" into tm-qpr-dev am:...

Merge "Allow inactive recommendation card and set timeout" into tm-qpr-dev am: e221f896 am: a0918d0f

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



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