Merge "Fix long click crash." into udc-dev am: 8cedc2a3 am: 7b222647 am:...

Merge "Fix long click crash." into udc-dev am: 8cedc2a3 am: 7b222647 am: fef4a3d7 am: eb338a61

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



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