Merge "Create TM for each subId to register phonestatelistner" am: 1debb27090
am: d2d9e16b40

Change-Id: I86ba43e586acc06ae8c2c23235bd2fc8869c14c4