Merge "Fix IsolatedUidAllocator for non-primary users." into qt-qpr1-dev am: 074d6fbd3f am: d80723b65a

Change-Id: I1659d181b88411de33561c225bf0b1a40097cfea