[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and...

[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into qt-qpr1-dev am: b2307f8d -s ours am: 2991fea6 am: f9f2358d am: e6bbed73 am: ef3819b3 am: 05a48a2d -s ours

am skip reason: subject contains skip directive

Change-Id: Ic7ebf2a21ac1818948694969d125cc514b94793e