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

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

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