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

Change-Id: Ib516f163ffe90ced292572fe29f2aa3b05485b49