[automerger skipped] Merge "Add androidx.test.janktesthelper and androidx.test.uiautomator" into pie-cts-dev am: b1a0c21592 am: 817002a9c1 -s ours
am: 791d884450 -s ours
am skip reason: change_id I8ba9ce389eab3d1fa9d7c998238fd3d63ea87bbd with SHA1 3098b15647 is in history

Change-Id: I5d21a506beb3861e29cfaff05f04b6b5b44418af