Merge "A system folder for emergency number database OTA"
am: 8834223ff8

Change-Id: I86dc6f417c2e78a34bc374755c3dd2a12cc41513