[automerger skipped] Merge "Add equals() & hashCode() for VpnProfileState"...

[automerger skipped] Merge "Add equals() & hashCode() for VpnProfileState" into tm-dev am: 7f4e0c58 -s ours am: 99217f5d -s ours am: f47f62d7 -s ours

am skip reason: Merged-In I8711187e690385866fa681c3fe5fccdf353ac30b with SHA-1 c867675e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108519



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