Combine separate UIObject validators into two inherited validators.

Test: No functional changes.
BUG: 273366005
Change-Id: I22b23d70122b82f8d94a3475cefadd177b4e70d1
23 files changed