Merge "Fix back taking multiple swipes." into tm-dev am: 342dccd9

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



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