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

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

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

Change-Id: Ic1d54d7625dafb165305f7bd593de5af54481380