[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: fb0419e1 -s ours am: 0361dab3 -s ours am: 8e258a18 -s ours am: 75f0791a -s ours am: fa8ed2c7 -s ours am: 0bcd44be -s ours am: 2a1ecc78 -s ours am: aae9f48a -s ours am: cdad4688 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia2ed8a16e1b5915788a31ba676bf330b32faf85c