Merge "Add null check to a11y interrupt. am: 74f9e1b867 am: 278782f275" into nyc-mr2-dev-plus-aosp
am: 87d9244976

Change-Id: I596c43e798d9f975fc2b6a29bf078cf7d763447a