Merge "Rewriting phone constants for mainline" am: 9d604bfc68

Change-Id: Ic0a0ae5798f055274da26f05d0f44d3dd8aaf2fd
tree: 4534e7e2bcb6bd8141dbeb25509710559f5f58fc
  1. service/
  2. PREUPLOAD.cfg