Merge "Fix publishing RPC Server on the same address/port after a short time"...

Merge "Fix publishing RPC Server on the same address/port after a short time" am: 56206ef8 am: 76da5c19 am: 030331a9 am: a4f0672c am: faefdd03 am: c8709f3d

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



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