Merge "Long-press not required for mouse or stylus." into tm-qpr-dev am: 7ae05438

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



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