Merge \"Merge \\\"Fix DND conditional null state\\\" into nyc-dev am: 733649c2fa
am: d944277d1f\" into nyc-mr1-dev-plus-aosp
am: 96169134bc
Change-Id: I876d3dcc6c752fd54d6f2a9e3af7dd93c167cc86
This commit is contained in: