Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b82 am: a012a313fc

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

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