Merge "[automerger skipped] Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev am: 58232838 -s ours am: 4eba51ee -s ours am: 53dc67ee -s ours am: f4c89e04 -s ours" into rvc-qpr-dev-plus-aosp am: d19f2a54 -s ours

am skip reason: subject contains skip directive

Change-Id: I9505df6ae4cee925d5ec9ad5c61e8253e270d0f6