Merge changes from topic "delegate1" into sc-v2-dev am: 847e706476 am: 5dd9b2e915

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

Change-Id: I9249675010f9a3f77fb4b615a5a7d2a2a58d5499