[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 skip reason: subject contains skip directive

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



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