Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev
am: 4ad89bf51f

Change-Id: I3024ca375ebf077cba52696da7ac549bf0eff781