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

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

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