Merge "Add cause exception to port discovery errors" am: b5a2210c9e am: b38a113b6f am: acfec18a22

Original change: https://android-review.googlesource.com/c/platform/cts/+/1635620

Change-Id: Ie1254b7740b9992627a4b1cd6916e131aae1da90