Merge from widevine repo of http://go/wvgerrit/14970 Even if devices cannot handle key ids with different lengths in the same license, they should still handle keys with a shorter key id. This is a partial fix for: bug: 21935358 Change-Id: Ibc84f0b5d7d9bc5d24a2081f0581a2b256e51f44