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