fix IME overlapping fields while typing in certain situations

Change-Id: Ia8762443b4f43174fb416bd432c2e70f97881558
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Properly handle changes in phone audio focus.

Change-Id: I921651684f4369a47aa83e93010266c40be71a41
Merge "fix IME overlapping fields while typing in certain situations" into jb-mr1
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

	modified:   media/java/android/media/AudioService.java
	modified:   policy/src/com/android/internal/policy/impl/PhoneWindowManager.java