Merge "Use updateCecDevice to update existing deviceInfo" into main am: 5be0728065 am: 3dfc64d475 am: 9e409d65d9

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

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