Within origin design, subscriptions with same group UUID
are not merged together.
This is a fix which changing grouping by UUID part into a configurable
option which allows to be enabled in some other conditions.
Bug: 191228344
Test: local
Change-Id: I0101f4a51ec2342f059762f0e7d38bb4e93554cf