[automerger skipped] Merge "libbinder: avoid re-registering callback" into rvc-dev am: e515579fae -s ours am: 16c1d1237b -s ours am: e277aaa94c -s ours am: bf9b994000 -s ours

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

Change-Id: I0ea8733e28e846776b0632c273776e806d1437da