Merge "Remove LockdownButtonPreferenceController from java"