Merge changes from topic "binder_rpc_test_ephermeral_port" am: 27f2ed6973 am: 8f02b01621

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

Change-Id: Idbf6a2647c00076553f86c3762afcbe7ddea94e3