Merge changes from topic "am-4d6ad82e46eb430685e35e0bf1b406a4"

* changes:
  Merge "[DO NOT MERGE] Increase timeout for UIAutomation" into android13-tests-dev am: c25a6786ff
  [DO NOT MERGE] Increase timeout for UIAutomation am: 09c55d36e5