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

Change-Id: Id04f702a6847e34fcca1cc2c90bdb8705f236824