Merge "Merge "Fix TimePicker RTL issues" into oc-dev am: 7b95c932d6 am: 32974e0705" into oc-dr1-dev-plus-aosp
am: 74ad86eec7

Change-Id: If51e6a23b784c907f10273f36a4cfd5ea2d9b230