[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking"
am: 62d5e041a2  -s ours

Change-Id: Ic9cbde38cded481a75ce772f91c741f39de0360f