[automerger skipped] Merge "Remove framework-connectivity-proto from platform"...

[automerger skipped] Merge "Remove framework-connectivity-proto from platform" am: 90a441ea am: ff4a9295 am: 4d01f32e -s ours

am skip reason: Merged-In I3083a43a2f9c20768264ce2a531e0a0593f31697 with SHA-1 93239bf0 is already in history

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



Change-Id: I9db1c946b68f900a6f24f48000b93f8cd7238f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>