Merge "Introduce an IconsContentProvider." into rvc-dev am: 33e891d1a2 am: 3b73108abb am: 95fa801c04
Change-Id: I3d3baaeea255189e656b5edda8d4d167afa64161
This commit is contained in: