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

Change-Id: I83d3ef1cc6efe9121bd8d2f196d51137408964d7