[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and...

[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: e779363c -s ours am: 6460f031 -s ours am: 4eaa2834 -s ours am: 705fb0fa -s ours

am skip reason: subject contains skip directive

Change-Id: Id414a28fbaf89ae0885841d1237cbf61e5a85693