Merge "Add constants of VpnManager events" am: 3cca242ec3 am: b4c82c6f3a am: af3813a332

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

Change-Id: Id840c643ec44498eb5cd5d7e4646759e65670b29