[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: 4eba51ee -s ours
am skip reason: Change-Id I1812818c3d49463c3840a98212bbab58a110359a with SHA-1 7d9f1e3e is in history
Change-Id: I32742df2488bb969ca0b69f021e3e3c82c3288e6