[automerger skipped] Merge "libbinder: avoid re-registering callback" into rvc-dev am: e515579fae am: ed0988a12e -s ours am: e40259ce3c -s ours am: 1f7f44f97a -s ours

am skip reason: Change-Id I19474e105b4c4b3669499ac71c8cf22b67a0176b with SHA-1 1e2ba9299e is in history

Change-Id: I28ade31382ee2ef0b60886b5eb67a7a7140fd843