[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: a90e5dff am: 0a984d5b am: fb2a1fef -s ours

am skip reason: subject contains skip directive

Change-Id: I4b1df88ddbf75e08dc737281ed6fa69f1c702d63