Merge contacts src-N/ and src-pre-N/ dirs (1/3)

Bug 30124466

(cherry picked from commit 5289a29b88f436e6061c49e90fea8266437714ab)

Change-Id: I2ad91c9148132f80eca588cc0458ef6158bc37ac
2 files changed