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

am skip reason: subject contains skip directive

Change-Id: I6de3962c29dd112a7da39b374f8dcd9004267550