[automerger skipped] Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev am: 3baf9409d5 -s ours am: 846de3551c -s ours am: bfdfab7595 -s ours
am skip reason: Change-Id I1812818c3d49463c3840a98212bbab58a110359a with SHA-1 0f0e3a99f1 is in history
Change-Id: I687d7e2a24fe0a5ff0bfe9295b1fd52ffe575782
This commit is contained in: