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

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



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