Merge "Expose constants of ConnectivityManager" am: cb20318619 am: 9b01e26848

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

Change-Id: Ibd12c85a42d9b0c13113923c3a61dde7f2cd3e5a