[automerger skipped] DO NOT MERGE Remove references of telephony-stubs. am: 0f0e3a99f1 -s ours am: 24cb80c64d -s ours am: 8740a7c54d -s ours
am skip reason: subject contains skip directive Change-Id: I0eb1905c2cde79c5ae890b6a49ec42b36703b7ac
This commit is contained in: