Merge "Replace getPhoneCount with getMaxPhoneCount upon object allocation."
am: c084de230e

Change-Id: I7c5180045b6ae33d0d03b4ed7623487d25cacfec