Merge "Merge "DnD: Total silence doesn't suppress A11y" into oc-dev am: 9f1494368b am: 9a68e9b2ef" into oc-dr1-dev-plus-aosp
am: 0d090ade23

Change-Id: Ic67539b7f5500cf3ce23a5f45ec16a2e6df67798