am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1

* commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
tree: 488facb65d3b9369ef06ca34c3dabcd3406da238
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/