Merge pull request #12569 from cctuan/922462

Bug 922462 - [Flatfish] use 1.5x icon from manifest for tablet(cherry picked from commit 3c3eda6d93d7329f437b71d03c3d28353f1f3d4c)
Revert "Bug 922462 - Define various size of icons in manifest instead of use buildscript"

This reverts commit 32153515a3eedad26aec89322e02934a0dc06a0f.
Bug 917740 - Update file format of customization files based on MCC/MNC r=amac,salva,yurenju
Merge pull request #12571 from acperez/bug-922560

Bug 922560 - Fix typo error. r=yurenju(cherry picked from commit 67243760c86561e365bdd6def519105366e24be3)
Bug 922139 - Update lockscreen tests and app object to address to the new design on aurora
Merge pull request #12554 from teodosia/update-lockscreen

Bug 922139 - Update lockscreen tests and app object to address to the new design on aurora r=zac