Merge "Add shims for ConnectivityManager.getRestrictBackgroundStatus()" into nyc-mr1-dev