[automerger skipped] Merge "Add equals() & hashCode() for VpnProfileState" into tm-dev am: 7f4e0c5897 am: 8f595435b1 -s ours am: 9c45baf163 -s ours am: 713e0280db -s ours
am skip reason: Merged-In I8711187e690385866fa681c3fe5fccdf353ac30b with SHA-1 7e0ade67f7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108519
Change-Id: Iaf60d73bcaede6fa6f1c41ace60230f475a6f0b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: