[DO NOT MERGE] Compatibilize with git_master

Both branches diverged, they shouldn't. This CL compatibilizes master with changes from udc-dev that were not merged upstream

Bug: 237278810
Test: atest FlickerLibTest
Change-Id: I451fc1d77b24ab15c3d91ba7d3b909cfb4134b28