Merge "Keep Binder reference in the mServiceRecordToPid hashmap"