[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: 3e851b7e -s ours
am skip reason: Change-Id I1812818c3d49463c3840a98212bbab58a110359a with SHA-1 07a1871e is in history
Change-Id: I0cc6b968213abdc332c0f1c0fbc1f50dcdddef18