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

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

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