Merge "Update media hosts after recommendations expire" into tm-qpr-dev am:...

Merge "Update media hosts after recommendations expire" into tm-qpr-dev am: 03248115 am: 3c9c0a97

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



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