am 66625ff1: (-s ours) am dbc4edcc: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev

* commit '66625ff19266cf0b5b8d7fa700c996edb89b457f':