Merge "Revert "Revert "Revert "Enable static overlay for SettingsLib resources""""
am: 5bcbb14971

Change-Id: I25b60ff8d05ba2d6916bfa47dd07c6ed5f2fc228