[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev am: 6c1414ffac am: 8d37b54e76 -s ours am: e776ad2c63 -s ours am: fee7e9913b -s ours am: d3579addfa -s ours

am skip reason: Change-Id I60732f430256d37cb926d08d093581f051c4afed with SHA-1 da78af4d66 is in history

Change-Id: I081813e024b644720344fcf447cb6c64f90f284c