Add volume rocker with proximity sensor changes 2/2

Change-Id: I1af2e47dce6c668d7ec9f246f86dda3d1a95fe60
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	res/values/bs_strings.xml