Merge "Merge "Add icon packs for themepicker." into qt-dev am: 2c09b3be23" into qt-dev-plus-aosp
am: b800b56398

Change-Id: I55c252e608a0bcdc78b83a0dd185a0d22562a504