[automerger skipped] Merge "Fix script to compile emergency number database" am: e4eb692169 am: ee37a5b7b1 am: 3ce75a10c8
am: 10673da320 -s ours
am skip reason: change_id Ie65d20420fdba87bd64efb2cb693ec6819baa6bd with SHA1 9838ee813e is in history

Change-Id: Id74cd31bc46bb3e1cde279b61845d526c241e769