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

Change-Id: Ia1d0a12f8ec520325ef0ece2c74faed0a51dbfd3