commit 577bca327eaf49a7b524aa24d2faab640a83d763
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 10 00:44:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 10 00:44:15 2021 +0000
tree 6a0c3bbbceed175a98314e44c1b99e072a723608
parent 6112df12ca3aedd0c6a7cda0fa7d920d7a6718af
parent 57ce48b93df7cd60d594d2dbd16d8280c4c62760

Merge cherrypicks of [16049893, 16049894, 16049738, 16049991, 16049805, 16050129, 16049859, 16049992, 16049993, 16049994, 16049806, 16049739, 16050147, 16049257, 16049352, 16049645, 16049258, 16049492, 16050148, 16049493, 16049324, 16049995, 16049740, 16050149, 16049860, 16050130, 16050150, 16049741, 16050131, 16049996, 16049997, 16049714, 16049998, 16050151, 16049646, 16049325, 16050152] into sc-qpr1-release am: 57ce48b93d

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/SdkExtensions/+/16050000

Change-Id: Icf566291b1e5074a18ddb3b3cfb11c2dcd0b5c2e