Merge changes from topic "oem-paid-hal" into main am: 59dfb5211f am: 569d9217d9

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

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