Merge "Expose constants of ConnectivityManager" am: 62967ab5d5 am: cf22e5a521

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

Change-Id: Ibd12c85a42d9b0c13113923c3a61dde7f2cd3e5a