Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: 2b802a4745 am: a1ddc050fa am: 556f1fdaff
Change-Id: I5ce4a9f9d27fe566f54f30cf1b0470b76c4d92d5
This commit is contained in: