[automerger skipped] overrideConfig should use existing notification flow for CCC
am: c9d1fa1fd0 -s ours
am skip reason: change_id Ie2cccbab3e186091515bcdaf683d6925d2cbae37 with SHA1 97ce72822a is in history

Change-Id: Icef839edf40d0ee7c0df6c3d229c8eb7a1583bb8