[automerger skipped] Merge changes from topic "back_gesture_model_qpr" into rvc-qpr-dev am: 898602ef am: 594c0702 -s ours

am skip reason: Change-Id I6ecb556fea01f26323248b999d17c7b1d1b7eeb7 with SHA-1 3c2f51c9 is in history

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

Change-Id: I670124d4768b28f9579f7853b0e9c7e9220bb956