Revert "Active display: Option to change display timeout [2/2]"

This reverts commit f14c0f52b8ae09eea794740ad68e186f8aaf1770.

Conflicts:
	res/values/arrays.xml
Common fixes, cleanupp

PS2: Missing import
PS3: Additional cleanup, Use ab drawable instead
PS4: Remove saving options on NavRing
PS5: Cleanup

Change-Id: I5d041cf27789b175f39d89ecb3f89541e3f88ecc

Conflicts:
	Android.mk
	AndroidManifest.xml