Merge "Use CallableItem in place of MethodItem" into main am: 94c9498bf0

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

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