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