Merge "ConfirmationUI AIDL VTS tests fix."