[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into qt-dev am: 672530b42e am: 4a1b488d5e -s ours

am skip reason: subject contains skip directive

Change-Id: I4740483bcbfa5ff48403238cb5e9405601e725b5