Fix crash on accessibility service. am: 02bf9ac am: 06bc5da
am: f95ec9f

* commit 'f95ec9f653a2c97762d3117050ab4f9de0c419a9':

Change-Id: Id753592f3f9cd5e10fd1e924fca67e369e06a33b