[automerger skipped] DO NOT MERGE Remove references of telephony-stubs. am:...
[automerger skipped] DO NOT MERGE Remove references of telephony-stubs. am: 7d9f1e3e am: 94f45799 am: 7a366f2b -s ours
am skip reason: Change-Id I1812818c3d49463c3840a98212bbab58a110359a with SHA-1 7d9f1e3e is in history
Change-Id: I0848ea4f2db62db19c5d9bdf0d3aa91f27829ec3