Merge "Support CICPs in AImageDecoder" into udc-dev am: e8499938be am: 3f81145f32 am: 5b836bc0d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23096136 Change-Id: I49f4981ac89d99c1b755470c7e50cee79e612367 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: