Make the instrumentation test better am: 3629df4086

Original change: https://android-review.googlesource.com/c/platform/system/tools/aidl/+/1373161

Change-Id: I55c49eb9f0e31c88a1f0f0e1c75b38f8e27a4439