[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 -s ours am: 96d9253a -s ours am: 28e34f98 -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: I2115c279f8364fbbe4ef150dc1e63890be2e9e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>