Merge "Fixing jumping HUN when starting swiping" into tm-qpr-dev am: f58ce4e927 am: 15cb65593b

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

Change-Id: I8c11368e294ebc4a09a7b9d43d745d5396a9cbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>