[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: a79312f9c1 -s ours
am skip reason: subject contains skip directive Change-Id: Ief2fd8276a2c2c86e29b40c0169da238d05fd118
This commit is contained in: