Merge "Adapt CheckApfIsSupported for VSR-15 compatibility" into main am: b959192690

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

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