Bug 914942: uplift to the leo branch
Merge pull request #13614 from etiennesegonzac/bug-936793-call-log-migration-hotfix

Bug 936793 - HOTFIXing a call log idb migration by hardening the Contacts.findByNumber method. r=ferjm
(cherry picked from commit 300a4e05fef44a4f47a3f573446de6311b317434)
Merge pull request #13720 from fabi1cazenave/uplift2-bug914942

Bug 914942: uplift to the leo branch
Merge branch 'v1-train' into v1.1.0hd