[automerger skipped] Merge "libbinder: avoid re-registering callback" into rvc-dev am: e515579f -s ours am: 16c1d123 -s ours
am skip reason: Change-Id I19474e105b4c4b3669499ac71c8cf22b67a0176b with SHA-1 6077425c is in history
Change-Id: I3ff14dd53c088c9c7e3345ce44a12bf910cf2c88