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

Change-Id: I112177e1a4e01b5731878c8733be46330a47e41f