CM11 Themes: Remove type matching restriction

Change-Id: I5a8ac8ff1794350ff9dc03b378c704bfb97d0a9e
Merge "CM11 Themes: Remove type matching restriction" into cm-11.0
Merge remote branch 'cm/cm-11.0' into cm-11.0