Merge "Enable allow_emergency_numbers_in_call_log_bool for China." am: 467e181f63 am: d02eb299cd am: fb5e1e5cae
am: 9348a01893

Change-Id: I9d5ffd97c61caff3966776427051e8b034876388