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

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



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