Merge "After this change, we'll show the emergency notification even in...
Merge "After this change, we'll show the emergency notification even in Airplane Mode when the user is registered for Wifi Calling." into oc-mr1-dev am: d142983a
am: 2dbb59cf
Change-Id: Ieffb4f2a7a8eebfb507817fe2a14ee5459374f4a