Refactor to Settings design Bug: 275003276 Bug: 264483854 Change-Id: Ibea987b6e51fd76c89a0ff5269da6e99171f6b1c
ba69fd0d3f
d5ab7dc729