[automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1c9bf5cc am: 2e254bb8 -s ours am: fb0419e1 -s ours am: 0361dab3 -s ours am: 8e258a18 -s ours am: 75f0791a -s ours am: fa8ed2c7 -s ours am: 0bcd44be -s ours am: 3b669608 -s ours

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

Change-Id: Id9e82600808f9c02f1a9b59a42bfa7ce447916aa