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

Change-Id: Ia79fec43e2594f0a2c30043cac83165d794a7f35