[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev am: 6c1414ff am: 8d37b54e -s ours am: e776ad2c -s ours am: fee7e991 -s ours am: d3579add -s ours am: a8441e20 -s ours am: 7bf62fe5 -s ours am: 44b3b60b -s ours am: 94a26272 -s ours am: dc541d3d -s ours

am skip reason: subject contains skip directive

Change-Id: Ia68d19728dd7e7889e46e9d5142966d63373eecf