Merge "DO NOT MERGE Cherry-Pick: Add ViewConfiguration.getScaledScrollFactor()" into cw-f-dev am: b8e74df82d
am: d84d0391ff  -s ours

Change-Id: Ie364aff3c556d5d4598f0ddfeb9a7d86dec9330a