[automerger skipped] Revert^2 "Atest: Fix 'http.client' - 'http' is not a package." am: d5e34f0298 am: cd75445041 -s ours am: 22e7c81f06 -s ours

am skip reason: skipped by user yangbill

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/asuite/+/16187033

Change-Id: I61c081d248c4222a4c0aab6b1f56359d61198adb