[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into pi-dev am: 321b255d -s ours am: 29043c67 am: 0651bb4f -s ours am: 7875c308 am: 571aa1a4 am: f0684499 am: c4caf114 -s ours

am skip reason: subject contains skip directive

Change-Id: Iff8af8059a8111354274845acdfa8cbf78effbf4