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

Change-Id: Idbe1de34c738bf0b3a17ce9e68dfb3c67b151b9c