[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: 4cc1cf9a am: 02bffd18 am: c42d24c7 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie685fbee62b12993a7ad68cd9078218331dab176