Merge "Fix clearkey v1.4 issues" into sc-dev am: 49afb280

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14489969

Change-Id: I8a3d98b96a8d9881410191035b2615e9edeef3e2