Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8
am: d8f14f11b0
am: 0c23dcd4ec
Change-Id: I45030df6c87f49b79e1965706b2c945c778a6b03
This commit is contained in: