[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 skip reason: Change-Id I60732f430256d37cb926d08d093581f051c4afed with SHA-1 0d7e27af is in history

Change-Id: I65557f8f81d1d3011a49bca1dcd8bcfa909c7b80