tree c16149fce2ab5066f5d875b6a3fadddc2058b872
parent 56187ffc95aa677292644736b98c26d597f68ed9
parent 414f55eb9180890f80b4f8a772dae56ab9663245
author Duy Truong <duytruong@google.com> 1663817945 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1663817945 +0000

Merge changes from topic "sts-sdk" into sc-mainline-prod am: 4db0005a13 am: 19ef59596a am: 414f55eb91

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

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