Merge \"Updating the shortcut icons for Settings app\" into nyc-mr1-dev
am: fe9bf6d9d1
Change-Id: Iaf16d11e30a19fe7a9c58e34d3b15045bd9e3d9a
This commit is contained in:
am: fe9bf6d9d1
Change-Id: Iaf16d11e30a19fe7a9c58e34d3b15045bd9e3d9a