Merge "DnD: Total silence doesn't suppress A11y" into oc-dev am: 9f1494368b
am: 34bc810b0b

Change-Id: I55c12d8767efa48ac596679e1c967a015d597a60