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