Merge "Add a public test method to reset package version" am: 8bed9edeea am: 43fb6d166e am: ca075cf0bc

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1596433

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14a7c8ad27ed998f8c905c0b24cd021710081d97