Merge "[automerger skipped] Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev am: 3baf9409d5 -s ours am: 846de3551c -s ours am: 53dc67ee8c -s ours am: 0533ccbb35 -s ours" into rvc-qpr-dev-plus-aosp am: d19f2a547b -s ours
am skip reason: subject contains skip directive Change-Id: I9505df6ae4cee925d5ec9ad5c61e8253e270d0f6
This commit is contained in: