[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 skip reason: subject contains skip directive

Change-Id: Ica1f5e73e2f43e143f57c1ba3a831809ee9526d2