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

Change-Id: I9624781ddd96d627f00b609317d37b9695abe02b