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

Change-Id: I2881f006056ba14127f12da6921ee3d7168b2768