Merge "Add item type value to a CHECK call" into main am: 12d13a0fb8

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

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