Merge "Fixed crash loop of the Telephony in case of bad restore. am: 56117b955d am: 843bfaf9a6" into nyc-mr1-dev-plus-aosp