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

Change-Id: I4ecf461b87265617181d83edfe7a2acc1c7dadb3