Merge "Minimize dirgroup for Trusty build" into main am: eadfa7a54a am: 895e0c948c

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

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