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.