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

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

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



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