Add support for custom app and uri in events
Add support for custom app and uri in events

Bug: 6325441
Change-Id: I58e007857fdfc76459ed41c3c8384c85a2260e89

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base