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