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: b9bfa52e am: 20da1dff

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



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