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: I596e9fc8d98bd6b1b601412e7e156edbeebf423e