Add null check to a11y interrupt. am: 74f9e1b867
am: 278782f275

Change-Id: I92d0cce490535b667a10de46fe0e24fad6305c13