Merge "Fix headless package-check issue in soundtrigger" into udc-qpr-dev am: 5a6ee010

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24029513



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