[automerger skipped] Merge "Add Extra Business Logic support" into pi-dev am: c81ff0cd77 -s ours am: 8a33d4a865 -s ours am: 21aa3a0f90 -s ours

am skip reason: Merged-In Ic10bca7316feb343b3b3077a77b317bb7c0f3b4c with SHA-1 ba244d1d56 is already in history

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

Change-Id: I8a42eebdfc15d29c96b6325e212930b52db1c61d