Settings: fix volume button swap for tablets (2/2)

Change-Id: Ic65e87b92d997511ac0a43846e0ee1c70fd1a940

Conflicts:
	src/com/android/settings/liquid/DisplayRotation.java