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

Change-Id: Ic805270ae3f8767327bba90eb304d4614ea4c9f6