Merge "Don't include stretch overscroll in benchmark." into sc-dev am:...

Merge "Don't include stretch overscroll in benchmark." into sc-dev am: 1b03d205 am: 9c937d0f am: 86554c5b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457076

Change-Id: I04ff6a85f1fb68a0901c8d09c68ab6924f49a5dd