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