[automerger skipped] Merge "CCodecConfig: apply KEY_ROTATION for image domain"...

[automerger skipped] Merge "CCodecConfig: apply KEY_ROTATION for image domain" into tm-dev am: e167578c am: 6ac74301 -s ours

am skip reason: Merged-In I3cb59b3ee0637387423ce9c52a6d265396196d44 with SHA-1 49655c5c is already in history

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



Change-Id: Iccf57a2dfab25e6d1e975c3e7ed8d7b6d616f701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>