[automerger skipped] DO NOT MERGE Remove references of telephony-stubs. am: 0f0e3a99f1 -s ours am: 24cb80c64d -s ours
am skip reason: Change-Id I1812818c3d49463c3840a98212bbab58a110359a with SHA-1 ee27d55295 is in history
Change-Id: Iaffd5aafbf541dce72111b7084c0a40be943f6e6
This commit is contained in: