Merge "Add Extra Business Logic support" into rvc-dev am: 92b10790f5

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

Change-Id: Ic181c49643c3c1b681f88f527ece73599be132e8