Merge "Correct NDK docs for MediaDrm#getKeyRequest" into oc-dev am: 08e96196ee
am: f951a68e20

Change-Id: I6c89ecd007acb99e78df082a37391c368dba4881