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