Merge changes from topic "sts-sdk" into sc-qpr1-dev am: 5bfd2ef9a6 am: cec272cdac am: bf9931ccdf am: c9166191b9

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

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