Merge "Add Voice / Data network specific reg states." am: ffdbbc533c am: e5932b56bc
am: bf960e0fd8

Change-Id: I5b7198b261b70bfff233c904e4565f3000dc8c88