[automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package...

[automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1c9bf5cc am: 2e254bb8 -s ours

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

Change-Id: Ia63f63d741f7d84866165bd9bbd3422057af541b