Merge "Check the device type instead of the object reference" into sc-dev am:...

Merge "Check the device type instead of the object reference" into sc-dev am: c9c67d25 am: bc78ae7e am: a98fa8e6

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

Change-Id: I0ccd4c0c0a8b9f896dbe61c67b19cc95cd192a68