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