[automerger skipped] Merge "Support CICPs in AImageDecoder" into udc-qpr-dev-plus-aosp am: 1702cb05 -s ours

am skip reason: Merged-In I3a720e391cb19872c9e3e9182a86322b1c0e7ad1 with SHA-1 24ea961d is already in history

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



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