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

Change-Id: Ic27debc1b021a77de57e384df7dba0f1d9209df8