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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic18f75a74d9aa24faa179f8950293e738c05b938
tree: 29f617fc52796181898f6c83a641c4eb5eadee6c
  1. staticlibs/