Merge "Fix reactivated media card when recommendation is invalid" into tm-qpr-dev am: 6ee27b1e

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



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