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

Change-Id: I909913ba5036c64bdc526d3ec73bfb81da33b3f1