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

Change-Id: I64aab97fb14ce653f529b1083828909dc58e66ac