Merge "fixes for non-secure widevine playback" into lmp-mr1-dev