Merge "Revert "Add package to Proxy2Test"" am: d6c5e7d143 am: f4b5c92b91

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

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