Merge "Fix AMediaDrm_queryKeyStatus returns key:key instead key:value pair." into oc-mr1-dev am: 872011203e
am: cf43836c9a

Change-Id: I6241d5d1231046988b155837f5454bdd60e70277