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

Change-Id: I56376083d6f5c5f86c58c2c1360bc6bb81a908c9