Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev-plus-aosp am: c504318d am: 5ee0f585 Change-Id: Ifcbc81365399a0e1a92567b33103ceec17b2c01b