[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 rvc-dev am: 34f72608 -s ours am: 62767d9c -s ours am: 5a138031 -s ours am: e43ee48e -s ours am: 01d360f8 -s ours am: e2f3821e -s ours

am skip reason: subject contains skip directive

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



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