Merge "Use explicit requirements from APEX" into main am: 5de1785959 am: fc146cc1b3 am: fe851395b7

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

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