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

Change-Id: I9e530a29daed0393c482255eebac0079857becf5