Merge "Extract action icons for Wear adjusted for optical alignment" into cw-f-dev
am: e61535ac8f

Change-Id: Iadcdd91dcd6239960dc63561ae2ad68272863b88