[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-mr1-dev am: 4f486e9f -s ours am: 074acecf -s ours am: a27754f5 am: dca2204a -s ours am: ea7607a0 am: 2343ffad am: 22b9cf97 am: e1247eea -s ours

am skip reason: subject contains skip directive

Change-Id: Ia2c5e9b2b7193381df0690cd17e17120e830a93a