[automerger skipped] Merge "Change Connectivity resources SDK version to 30" am: 742164747b am: 610cb04212 am: 58c1aa3f1e -s ours

am skip reason: skip tag Change-Id I35c63e4bfe7657afe1e7364926ab139b042b403e with SHA-1 20a8e9413f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679749

Change-Id: I09477ef4873bab9cb8b319a341502fc7f8fbec0f
tree: 86bbb29a2c4744e6cf7ebfd9f2427124c9825c26
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING