android: Add non-staging dirgroup am: 2c2c713a93

Original change: https://android-review.googlesource.com/c/trusty/vendor/google/aosp/+/3368183

Change-Id: Id1884ea823657f5a584e0a13fa29a87d6df47714
Signed-off-by: Automerger Merge Worker <[email protected]>