[automerger skipped] Merge "Remove internal dependency for PhoneGlobals/Phone" am: 9e9bf451c2 am: 83de0f9c2f
am: a366c2f471  -s ours

Change-Id: I348bee6f989f2410126200035badcdcc8546a675