Merge "No longer allow HIDL soundtrigger on new SoCs" am: e48a3a9014 am: 348d7155ee am: cf7fc8389e am: 936a344319

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

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