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