Merge "Revert "Add package to Proxy2Test"" am: d6c5e7d143 am: f4b5c92b91 am: 3f26eb7e36 am: a74cb63982 am: 4cbabafa4a

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2056088

Change-Id: I431d88f29c53a392e0aa4c563117848b1e81dc79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>