Merge "[automerger skipped] Merge "Add androidx.test.janktesthelper and...

Merge "[automerger skipped] Merge "Add androidx.test.janktesthelper and androidx.test.uiautomator" into pie-cts-dev am: b1a0c215 -s ours am: 098ec5d2 -s ours am: 4700b13b -s ours
am: eb30c188 -s ours
am skip reason: change_id I8ba9ce389eab3d1fa9d7c998238fd3d63ea87bbd with SHA1 3098b156 is in history

Change-Id: I9517f28f4ddf07849621272d15aef7c424a458ec