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

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



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