[automerger skipped] Merge "Do not send new Intent to non-exported activity...

[automerger skipped] Merge "Do not send new Intent to non-exported activity when navigateUpTo" into tm-dev am: 12d6101d am: 3e8ed071 -s ours am: 5e810b94 -s ours am: 27269c82 -s ours

am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 e2fc7675 is already in history

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



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