Merge changes from topic "revert-25485702-revert-25314358-uai-sysui-helper-UHAHWAZQKZ-QLCPCNHTYT" into main

* changes:
  Revert "Revert "Update uiautomator references in platform_testin..."
  Revert "Revert "Update uiautomator references in platform_testin..."