[automerger skipped] Merge "[binder] Replace NULL/0 with nullptr" am: a800be8391 am: aabd6b7fa3  -s ours
am: d938b65f8a  -s ours

Change-Id: I23dd3a092887f862cc55302dc67de7601f8123eb