Merge "Remove unverified device info from Csrs" into main am: d6422ebc0b am: 689cdb2c4d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3414002

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