[automerger skipped] Merge "Create ServiceConnectivityResources" am: eb46aa1c58 am: 4df498eb9a am: 19e5014a61 -s ours

am skip reason: skip tag Change-Id I77ac6f4303c54acc96f16e18ef02add30298ff3d with SHA-1 0c8f517e50 is already in history

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

Change-Id: I95598f3c3fae16b5d2ec5dd314530649aee5e9b6