[automerger skipped] Merge "Preemptive minimal import" am: 38bd71130e am: ef8b8b95d2 am: 3b7159f01e -s ours

am skip reason: Merged-In I6fbc22272ba95b44aa09ff08f9d9a7adbb9ae8be with SHA-1 73f935c43b is already in history

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

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