[automerger skipped] Merge "Expose API isInEmergencySmsMode" am: afb05a64c1 am: c5634216d7

am: e5adf943f6 -s ours
am skip reason: change_id Ib9c1a4e05f5c8417b93e11cdf6bf81304e57eaec with SHA1 064b674358 is in history

Change-Id: I16744f9adbaa10ab2491f3fd87d803823580497d
This commit is contained in:
Meng Wang
2019-11-25 16:32:03 -08:00
committed by android-build-merger

Diff Content Not Available