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

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

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