[automerger skipped] Merge "DO NOT MERGE Remove references of...
[automerger skipped] Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev am: 58232838 -s ours
am skip reason: Change-Id I1812818c3d49463c3840a98212bbab58a110359a with SHA-1 07a1871e is in history
Change-Id: I6ff4c3d99b7f036ed7c0234e5a6b8f6bd696ebd6