Merge "Allow servicedispatcher to use an ip address" into main am: 97c05f17...

Merge "Allow servicedispatcher to use an ip address" into main am: 97c05f17 am: 458c54b8 am: d1e611ad am: 8a11e9c5

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2776820



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