Merge "Merge "DnD: Total silence doesn't suppress A11y" into oc-dev am: 9f149436 am: 9a68e9b2" into oc-dr1-dev-plus-aosp