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

Change-Id: I133e3cd0e64263e6f4f9980f1c7c84dde1bcf699