XPERIENCE 17

Change-Id: Idc423253be89dfc9d537e3a69b63b80ef788d2ca
Merge https://github.com/XPerience-x8/android_packages_apps_Settings into HEAD

Conflicts:
	res/xml/device_info_settings.xml

Change-Id: I064fdd9a87aea53ef2ee55937ce62ace866aedd2