Swap volume buttons when the screen is rotated by 90 or 180 degrees (2/2)
 - picked from SlimBean
Change-Id: Ie2166a4d50050e7a60933251bfc8cda97c42d419

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SoundSettings.java
Add Lock volume keys in silent mode [2/2] - picked from SlimBean

    Prevents silent mode from accidentally being unset by volume keys

    Forward ported from GB

    PS 2 : Reorder

    Change-Id: Ia86d191ac4db1e369fd3f9ac25644eb51feab67e

Conflicts:
	res/xml/sound_settings.xml
	src/com/android/settings/SoundSettings.java

Change-Id: I942b3c1204ab8b0042652e0b2d5a59dd15f21005