Merge classes created for UiAutomator migration

Test: presubmit
Bug: 235842600
Change-Id: Id617dbc33de73b11c7944389ce55099be14cc8ca
6 files changed