[automerger skipped] Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev am: 3baf9409d5 -s ours am: 1f093888f1 -s ours am: 38a595c418 -s ours
am skip reason: Change-Id I1812818c3d49463c3840a98212bbab58a110359a with SHA-1 69f3fa3729 is in history
Change-Id: I468dca6ee2b4ec688421e93abd1435f0939da67e
This commit is contained in: