Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038

Fix for b/4198446 HC - Support for Widevine Adaptive VOD

Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
2 files changed