Merge "Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am: 58df6ab9 am: 04171ecb" into oc-dr1-dev-plus-aosp