Merge "Add Extra Business Logic support" into android11-tests-dev am: c9329eed38

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

Change-Id: I5c9fffe1e07d00ff6d41c8118bdce777ba15e7a9