Merge "Fix to show PersonItemView for TYPE_CHOOSER_GRID correctly" am: ce85205894

Change-Id: Ic86f60af57b378f1e71c1367d7685139ab4aa106