Merge "Replace ConnectivityManager.isNetworkTypeMobile usage in NSS" am: 874aefac33 am: 01ea176bce am: a0f5d506aa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6030cf153aa76f666cafc1b4f28fa17d57a5da3e
tree: 230b15584effe63ef332277b411b9039f0696833
  1. core/
  2. services/