[automerger skipped] Merge "Replace getPhoneCount with getMaxPhoneCount upon object allocation." am: c084de230e am: b25b836f98 am: 534ab88ce1
am: 0218c18e90 -s ours
am skip reason: change_id I9a99853a22de0a4a78fd4ca622faddcdba3f8e06 with SHA1 fe624acb76 is in history

Change-Id: I0849e4385a9a1a44543f18fb8a5769f2f6e0cbee