(This is a merge of http://go/wvgerrit/139632.) While fixing a compiler error about shadowed variables in CdmSession, I noticed that this function had two result variables with different names as well. This patch consolidates down to one result variable. Bug: 207684988 Test: x86-64 Change-Id: Iaf6d742ef3409d85a1c364b486909d2497093112