Merge "Merge "Stop system process crash in TouchExplorer" into oc-dev am: be70141ed6" into oc-dev-plus-aosp