Merge "keystore2: Use libbinder_rs Strong references for Binder objects"