[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-dev am: 6c1414ff am: 8d37b54e -s ours am: e776ad2c -s ours am: fee7e991 -s ours am: d3579add -s ours am: a8441e20 -s ours

am skip reason: subject contains skip directive

Change-Id: Icdac4d48d0125c0a2c44c2fb4afc553c26ad5558