Merge "Use explicit requirements from APEX" into main am: 5de17859 am: ea79c3a3 am: bed6c5bb

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



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