Merge "Add package to Proxy2Test" am: 23ed55cf97 am: c1eaac788a am: 88383b9b16 am: 7ba856e679

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

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