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

Change-Id: I07c6aedf87c6800e9cce247b07aaf3d17162ea2b