Merge "Remove unnecessary right padding from time picker"
am: 71a1e5cfe1

Change-Id: Idac6b702027f8e8f73ce5f752a71f2ed67f3e9c9