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

Change-Id: I9965413f30fa4e385486415790b21e105ff816b4