Merge "Minor update canHandleType()" into tm-qpr-dev am: 5c14f88b am: 6208e971

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



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