Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev
am: 60a9ed8627

Change-Id: I9a16629067a76f2113c6ed312796aa47dda7f649