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

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

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



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