Additonally move xiaomi's additions to xiaomi_framework_compatibility_matrix.xml and make them optional. Change-Id: Ib3abddb4a9e9615fb973b9efd2e511d96998d6ce