[automerger skipped] Merge "Change Connectivity resources SDK version to 30" am: b15df2fce6 am: 9c4a07f441 am: 05197722a3 -s ours

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

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

Change-Id: I09477ef4873bab9cb8b319a341502fc7f8fbec0f