Merge "Align account icon size of ChooseAccountTypeActivity" into pi-dev
am: 8aeb74ace1

Change-Id: I51f785a74136e46ddaa99d145105d4fd757a3fa6