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

Change-Id: I3b84be0f8beba2d9108eeb4d43f4c633b837e368