[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-mr1-dev am: 4f486e9f0b -s ours am: 074acecf67 -s ours am: a27754f5cd

Change-Id: I9d6fa58f0ba0ecbefe678115ab2e0004afad46f4