am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev

* commit '952977322215b990f5aa6898bfaa40bb064545f4':
  Fix NOT_RESTRICTED network capability and enforce it.