[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: 7bf62fe5 -s ours am: e779363c -s ours

am skip reason: Change-Id I60732f430256d37cb926d08d093581f051c4afed with SHA-1 da78af4d is in history

Change-Id: I93f5b81c35784e56ccd9111aaad6fcd512240be0