Merge "Revert "Enable static overlay for SettingsLib resources"" am: accbb6b3c6
am: 495690c247

Change-Id: I9b90bd22088d307bfa812742b13302dd11c16907