Merge changes from topic "apply_promoted_emergency_numbers" am: 38aaf2e16d
am: 7ce5521f9e

Change-Id: I2f791f9a806d72e24b191f81ebb7de161cf4ef64