Merge "Temporarily Revert "Add Extra Business Logic support"" into sc-dev am: 5b598a03f7 am: d45fc22c88

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15632420

Change-Id: I6b0f4dc741eec5b46027dd464272a4191329b559