[automerger skipped] Merge "Create ServiceConnectivityResources" am: d9d976f8f5 am: 33674f408b am: 1154393902 -s ours
am skip reason: skip tag Change-Id I77ac6f4303c54acc96f16e18ef02add30298ff3d with SHA-1 56520566ce is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620871
Change-Id: I95598f3c3fae16b5d2ec5dd314530649aee5e9b6
This commit is contained in: