Merge "Fix validation logic in TvInputAidlTest" into main