Revert "Fix settings tile"

This reverts commit 8a639c8b9b0776eac0cbfa2bfb66e3c033bddcbb.

Change-Id: Ic8608fe255631a8c3d7c6aea764fbe54f276b0da
Merge branch 'jbam10' of github.com:BAM-Team/android_frameworks_base into jbam10