Merge "Add PhoneAccount rows to phone_lookup projection" am: f2ebd6d343
am: 2a980a9fd1

Change-Id: I369da2b881ead66f1e595779fd4270138996104d