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

Change-Id: I2b742876d63aa5cfb000fec47aa7a4c86daae98b