Merge "Fixing jumping HUN when starting swiping" into tm-qpr-dev am: f58ce4e9

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



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