Merge "expose getIsimDomain to systemAPI" am: 56d40d3c78
am: 2b38567586

Change-Id: If5313657b5095d668abc8af7de2c99594372a89b