Merge "Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am: 58df6ab93f am: 04171ecb31" into oc-dr1-dev-plus-aosp
am: 8e8a88ee0f

Change-Id: Ia2373803193ec498824a2808c3401e64c8301174