Merge "Fix long click crash." into udc-dev am: 8cedc2a3 am: 9582fc9d am:...

Merge "Fix long click crash." into udc-dev am: 8cedc2a3 am: 9582fc9d am: f7b5d666 am: 74870a96

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



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