Merge "Compare Emergency number display priority" am: a9d551ca7b
am: 1f36225eaf

Change-Id: Ie177f4fda621f5415f236bae305731ebcf7c34fe