Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
am: f650c82b16

Change-Id: Ib986a31914727d56ce4b71f360f5dd5f6ebf1dc6