Merge "STT: combined build supports more targets to build" into main am: 795b8b2e6f am: f84943e6af am: 3e5fd8cc71 am: 3575736424 am: 6fb4743a64

Original change: https://android-review.googlesource.com/c/platform/development/+/2722733

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