Merge "Removing reflection from AlphabeticIndexCompat" into ub-launcher3-calgary-polish
am: 1b7e9bc063

Change-Id: I22f83a9850f63a1a2bb00becd7fd1ce2610a2ab9