[automerger skipped] Merge "Native Side of Binder Proxy Tracking by Uid"
am: 8b8ce408fb  -s ours

Change-Id: I0498a71136d5de31933eb394af649d1390b7eee2