Merge "Use updateCecDevice to update existing deviceInfo" into main am: 5be0728065 am: 35617f9dbf

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

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