Settings: Quick tiles row option (2/2) merge fix

Change-Id: I500ff75426524b52e2e0d5969fbfcc6ab78a36a4
Settings: Settings: Add quick settings tile for devices that support fast charge (2/2) merge fix

Change-Id: I9e1314e1e50d9ccfee8772be16c6c3a848921bbd