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

Change-Id: I8554d726497621d2c54469449149921b3448a45e