Also mark KEY_CHANNEL_MASK optional. Change-Id: I569087f564dc60a89b15a3440a9b1c538927f610 related-to-bug: 7623602