[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-mr1-dev am: 4f486e9f -s ours am: 074acecf -s ours am: a27754f5 am: dca2204a -s ours am: ea7607a0 am: 2343ffad am: 0738d696 am: 395e7df0 am: 333c1536 -s ours

am skip reason: subject contains skip directive

Change-Id: I4862bd8af2d0165aa4db4d8cd94b4bfbd03ae84d