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

am skip reason: subject contains skip directive

Change-Id: I9fdefbb508ebe16497b04f15e4a9894d9a376652