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

am skip reason: subject contains skip directive

Change-Id: I17bce7f23416ef5239567ff33c0597cb6f6ecd4c