[automerger skipped] DO NOT MERGE Remove references of telephony-stubs. am: 69f3fa3729 am: be9e615173 am: 7247e5d10b -s ours
am skip reason: subject contains skip directive Change-Id: I1452756aab483cbc05594a21d580961e5a8dc024
This commit is contained in: