tree 793eb956538f3d5a0e433fec4dc899fae4756822
parent b0b153cfb1c941e03d36374bea97da66d3a094d3
parent de54ec5be90d9ed42442d7a17148d186284466ac
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582833163 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582833163 +0000

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

Change-Id: I7604a49708057ffd5e48ad0a9fe2be346ca83847