Fix FC

Change-Id: I00d4639fb52b887085f1e234b44e676755ed8ddf
Merge branch 'DJL10.2' of github.com:DJL10-2/android_packages_apps_Settings into DJL10.2