Move Custom Settings into own APK

Change-Id: If12a969ca154cae04a766a7e279f203abe44b30a