Fix overlay

Conflicts:
	overlay/frameworks/base/core/res/res/xml/storage_list.xml