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

* commit '0d7bbf6e33f7b64b03fa20fefd42cf9d926b9eab':

Change-Id: Ib8af4afd8e65f113345ecddcd14b89e1c7bf936d