Merged in http://go/wvgerrit/160638 Test: Netflix, Play TV and Movies, Youtube Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine Test: ./build_and_run_all_unit_tests.sh Bug: 239462891 Change-Id: Ib63abfaf70edec01e2ef5f81678d6bae1462fd65