Merge "Enable static overlay for SettingsLib resources" am: e3483a5814
am: b42cfb7662

Change-Id: Iadc904b715534eb2dbe13565be7156fff1cdc0cf