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