Merge "APM: uid-device affinity: fix for multiple concurrent apps" into qt-dev am: b09f621af6
am: 5f5158fe34

Change-Id: Ic766a8ef35f7d4826819ca53a51def1f6c659882