Merge \"Merge \\\"Fix SeekBar tickmark tinting pre-21 DO NOT MERGE ANYWHERE\\\" into nyc-dev am: 0cda2907ae  -s ours am: d4edcab008  -s ours\" into nyc-mr1-dev-plus-aosp
am: 040b6f502e  -s ours

Change-Id: I5a7a799a10b44bf16fc5e2a9c947e94dcadd5e3f