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

am skip reason: subject contains skip directive

Change-Id: Icdac4d48d0125c0a2c44c2fb4afc553c26ad5558