am 61cd0534: Merge changes Ie410c1ae,I8dbab7e3 into jb-mr2-dev

* commit '61cd0534137ebc9ba88e636daaafeeb106430180':
  Added CTS test to complete MediaDrm offline API change clarification
  Adding CTS test for secure stop APIs