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

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

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