Update notes for submitted changes

* Camera2: Fix AOSP mismerge