Update Edge

Change-Id: I26ed9c617f28cbc33611456e66abe55107d3321f

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

Change-Id: I87529cb166b43ef99c9e2667061d5712a7a45414

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