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