[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into sc-dev am: 86032723 -s ours am: 2ec4fb22 -s ours am: 9c03d8f8 -s ours am: 222c361f -s ours am: 061107ce -s ours am: 620576be -s ours am: 695ca8f6 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518946



Change-Id: Ia548fe74d7a77a1227ba7d197aaff9d5b911ce1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>