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

* commit '41779e467a478e11de2df10ad97542e6f2d57ca7':
  Fix NOT_RESTRICTED network capability and enforce it.