Fix form layout and switch position of expiration date and cvv.

Change-Id: I7eb2de1684aaa0e9bbb4bd48205ae50ea79359fc
Merge "Fix form layout and switch position of expiration date and cvv."