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

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

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