Merge changes from topic "fling_after_pull" into sc-dev am: d8f57c7c am: 88a56757 am: 04c4d05e

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

Change-Id: I904cf7392adb39a1dc4c80671a1f6a815b4cfe05