[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: 8a0cd8fa am: 52a9549c -s ours am: d742ec71 -s ours

am skip reason: Merged-In I3cb59b3ee0637387423ce9c52a6d265396196d44 with SHA-1 677dcd52 is already in history

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



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