Merge "miss setPassFailButtonClickListeners() will cause fail button can't handle click event" am: 6eaba6a65b am: 8824002627 am: bba014439b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I946acdd45cab23f47135285262f5cae1d9e60c96