Merge "Add logging for media recommendation events" into tm-dev am: f30664e6 am: 684dd396

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



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