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

[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-mr1-dev am: 4f486e9f -s ours
am skip reason: subject contains skip directive

Change-Id: I25cc26ee2447031bef53ca7d950edfc1c85ea99f