[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: e4211601 am: 0bd37285 -s ours

am skip reason: subject contains skip directive

Change-Id: I3189f5ac00dbc2a7e48dee9d7dcf0351e64ef320