Upstream, CAF, and other small fixes.

Conflicts:

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java