Merge "Add logging for media click intent and location" into tm-dev am: ff3b96f4

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



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