Merge "Update TimePicker mode switch icon." into oc-dev am: 1812e446e1
am: 3ff9b30724

Change-Id: Idb7d538321c349d3d7b237df72d25e1d3fd9ff7a