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

Change-Id: I3e143b3b9cea4527a711b197ac92516bc703a70f