Merge "Added Locking for MmTelFeature" am: d273dea10b am: 3a92430622
am: a77af22570

Change-Id: Iae64fa9a18fecd98e97030abdfd08eabd7b29ac8