Merge "Use --skip-config --soong-only instead of --skip-make" am: 44c45759f9

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

Change-Id: Icc12be74e968d9831d2bb82bea9714698db092b0