Bug: 146355892 Test: atest TeleServiceTests Change-Id: I9dd1e1c40729fd884b4267691c4d262155365e2c (cherry picked from commit e3e06144)