Update highlight state for primary/secondary targets.

This commit makes it so that when selecting the primary action, the
secondary action is part of the highlighted area, while when selecting
the secondary action, only that is focused.

Bug: 5317438
Change-Id: I85fde86812c7ce35dd2887d158ca7c2eff205809