Merge changes from topic "fling_after_pull" into sc-dev am: d8f57c7c am: d541d423 am: c9a6df91

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

Change-Id: If4c29e07d13702f3358ce7933ffb815b9a4f3550