Merge "Prevent ClassCastException" into sc-v2-dev am: 32438ace61

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

Change-Id: Ie8b3d5e0deb70ed372451e3698fac5f597abec2a