remove cloud control from settings provider

Change-Id: I53ab072274b960a56694e847e630e5efbdd9cff3
tmp

Change-Id: I110c988512453d89e10319c2b19987716b7259b6