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