Merge changes from topic "sts-sdk" into sc-mainline-prod am: 4db0005a am: 19ef5959

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



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