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

Change-Id: I4bac4afe446384c4a3062d2b46bf43ae974217e9