[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: 753f094d -s ours am: 33f96bbc -s ours

am skip reason: subject contains skip directive

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



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