Merge "Fix finalized artifacts for tethering in API 30" am: 492dbcab37 am: e30bb2d1cb am: e1b9763c63

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1581723

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id14649ba2fcd2a08de5e17fddd8abf99c0291a94