Merge changes from topic "sts-sdk" into main am: 36a53d64d3 am: e080df68a6

Original change: https://android-review.googlesource.com/c/platform/platform_testing/+/3206804

Change-Id: Ie7b1fec873617956d3fe3c1f02fb17339a1fdd9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>