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

Change-Id: I9d0a9a258e8d3f65fed611390bdd0733e12bc450