[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 am: dca2204ab5 -s ours

am skip reason: subject contains skip directive

Change-Id: I28a6e361590febe9fee53f894d6a0bc5ac4467f6