tree 793eb956538f3d5a0e433fec4dc899fae4756822
parent 65e0d65817e33286e90dbc0654ee09658007f73c
parent e59b0420948346036145a5f7a04db27522501bef
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582832098 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582832098 +0000

Merge "Handle IllegalStateExceptions possible from EmergencyNumber APIs." am: 89be4ceffe am: e59b042094

Change-Id: I8b24f943f6146db45dec8ef23e345570e1f1d23e