Merge "Allow pickupGestureEnabled default configurable" into tm-qpr-dev am:...

Merge "Allow pickupGestureEnabled default configurable" into tm-qpr-dev am: fb952d5f am: 6e2fad23

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



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