Merge "overrideConfig should use existing notification flow for CCC"
am: 57c782bda0

Change-Id: I60dee63c1496e1a0f6ee9e346220decb46b39afc