commit df152be46d2f2dc40e169bc2651c3d6834d7e244
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 b86bf4c83f00eebffff882dcb6f3602ac89a3cb0
parent 6180380d2514acb150707c81a3e1d50b32fc642e
parent 36c55ccfa9824506a06a5b0633f3c1abee8f5d7c

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: 36c55ccfa9

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

Change-Id: If05da63bb2332798b890563a2367c9373acdd249