Merge \"Fix padding on round devices for AlertDialogs.\" into nyc-mr1-dev
am: 0cd4addd36

Change-Id: I5287b5cae2d18edc5dc2c5fbc2998c63fadbe583