Fix buttons not aligning to the right

Removing button style as it adds more padding than required. Adding
linearLayout again for aligning buttons to the right

Flag: EXEMPT bug fix
Fix: 365536132
Test: m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c9ad8145c15b363d1177491d7171f036428f7534)
Merged-In: If65670e722b7e716ef2a28a871a3fe870453bf3e
Change-Id: If65670e722b7e716ef2a28a871a3fe870453bf3e
1 file changed