Merge "Check if device is null before checking its type is echo reference."...

Merge "Check if device is null before checking its type is echo reference." into main am: 17500790 am: db897706

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3453484



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