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

Change-Id: I9dd8a6355d82ebdd7964672817ce735752e81d7f