Revert "cm: Remove Focal"

This reverts commit e4801d125a0dcf1059e43e7670ac28b8c934231c.
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2