am fd2dcfa4: am 493a4929: Merge "Add CTS tests for async event callouts from drm plugin to Java app" into jb-mr2-dev

* commit 'fd2dcfa43bda995f311dae82bffd9385f5ad8280':
  Add CTS tests for async event callouts from drm plugin to Java app