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

Change-Id: Id393a352e2318e08a57aa8f3cd038d0057c8adaf