Merge "openDecryptSession() should consistently return sp<DecryptHandle>"