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

Change-Id: If65c6d243dde16cb598bfed52dd0ecf8fad8047b