Merge "Define NOT_ROAMING network capability."
am: 8f380ab29c

Change-Id: If36fa11d97d0631df41191ea0cf4ce39981b236f