Move display variant to family

Change-Id: Ib33fdf235c6450fd69fa5bdcf3c53964fc5133b3
Merge remote-tracking branch 'cm/cm-11.0' into ose