Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: 6b2291f1cc am: 68bdeadd34 am: 9684e06b69 am: feb2822f5a
Change-Id: I25856fc025c87e9eb7ae635a76835a85f911f489
This commit is contained in: