[automerger skipped] Merge "add LOCAL_DISABLE_TEST_CONFIG logic" into sc-dev am: 8c499726 -s ours am: 411bc5b6 -s ours

am skip reason: Merged-In I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5 with SHA-1 32a085c0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14823788

Change-Id: I5a82cc8e3dba032f9efdac7615d607fb27226d89