Prototype making expanded notification states optional again

NOTE: this does not re-add the app name to the notification's collapsed state, which was a removed because we added these states as required.

Fixes: 339523906
Test: presubmit
Flag: android.app.notification_expansion_optional
Change-Id: Ie0a598ac04421fa0fd6d73f11614b81c73444a8c