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: 32cf6e78

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

Change-Id: Id19e150ae2b1c624664b8c79074e80662ec90e80