Update notes for submitted changes

* Move CM config options after AOSP config options