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

* commit '06bc5dad0dfd46e4506228f129f2f7da3b14142a':

Change-Id: I3671937d992264eb2fe0ebd5c8d33207c8f9fb6d