[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into pi-dev am: 321b255d93 -s ours am: 29043c67d8

Change-Id: Ic8b7eb2750fe284076e320b039f8f2b61ab40c06