Merge "Listeners of active emergency numbers" am: 7674b345a9
am: fc225eab6b

Change-Id: I842ae8f7c7820648c167f12ad15f095b1324b1d2