Merge changes from topic "sts-sdk" into sc-qpr1-dev am: 5bfd2ef9a6
am: cec272cdac
am: bf9931ccdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213 Change-Id: I08ec92ebe7da57290a7318a468b36cc838e701b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: