Merge "Add 8 missing mShouldTestTelecom checks"
am: c3593708f7

Change-Id: Idc7d9cb79e37f55cedf9cd85cf94187aae61ed53