Merge \\"Fix SeekBar tickmark tinting pre-21 DO NOT MERGE ANYWHERE\\" into nyc-dev am: 0cda2907ae  -s ours
am: d4edcab008  -s ours

Change-Id: Id69254655e0e46878716d3097ed0aca03a23c7a7