tree feea5855614948fcab525e76583613e925687f1e
parent 0361dab3d8be6540f845e09aba961608a25588a7
parent e776ad2c6356e997f685d0ce4629186951ebcb67
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583919668 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583919668 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev am: 6c1414ffac am: 8d37b54e76 -s ours am: e776ad2c63 -s ours

am skip reason: subject contains skip directive

Change-Id: Ica1f5e73e2f43e143f57c1ba3a831809ee9526d2