HALO

Change-Id: I33d00b22dccd7221cbea834b3bee728a12977ec8

Conflicts:
	overlay/frameworks/base/packages/SystemUI/res/values-zh-rCN/strings.xml
	overlay/frameworks/base/packages/SystemUI/res/values-zh-rTW/strings.xml
Adjust translation

Change-Id: I7a269c80bc68d34c258e79f861edbe7567761295

Conflicts:
	overlay/packages/apps/ROMControl/res/values-zh-rTW/strings.xml