Merge branch 'lego' of https://github.com/LEGO-ROM/android_packages_apps_Settings into lego