Merge "Migrate the rest of shortcuts to adaptive icons. am: 6e3242873c am: 8413328329" into oc-mr1-dev-plus-aosp
am: 259e1ae6f1

Change-Id: Ic8b15f21d28567be0ded023b9e3333918459a4e4