Merge "Stop double notifying a11y about Toasts." into nyc-mr1-dev
am: 85d18cce6d

Change-Id: I2c344d7c7fbaa26dae0119f1bd678ea40afa1e53