[automerger skipped] Merge "Minor update canHandleType()" am: 002e7fd1ca am: a79bad63a3 am: c74f9a0522 am: f847767964 -s ours am: f3020a9c06 -s ours
am skip reason: Merged-In I5e1ca1361dfe04cd484e585f095aff0c5ff2579f with SHA-1 59e996dd23 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154446
Change-Id: I7470c6d95d5fe6d6c8b46525e67cfcfdd0c2ff0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: