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

Change-Id: I6a6132648079b843f69e8575a96238f45052ee5a