[conflict] Merge cherrypicks of [20271394] into tm-qpr1-release. am: 9e49886a91

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

Change-Id: I4cd27ff1e3d3ad44dc5e4c78fef92205c1c25c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: bad9ec55548f61e7c9666654699cbb9aad5a01fd
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS