Merge "Merge "Revert "Revert "Enable static overlay for SettingsLib resources""" am: 4fd23b08e3 am: cabf640bb4 am: 6382f9411f"