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

Change-Id: I42f0c9cf045be4de14909c1c5dd4a31c6128ff5c