Merge "Update clearData flow for notification settings" into qt-dev
am: a2620b9c97

Change-Id: I168bb783f8fca62cf6aa73874570910643a41920