Merge \"Adjust touch progress offset to account for changes to AbsSeekBar\" into nyc-mr1-dev
am: 7dd40cd411

Change-Id: Idf55be8f8577d1602505e6d65dd15d56d2a2c16f