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

Merge "[automerger skipped] Merge "Do not send new Intent to non-exported activity when navigateUpTo" into tm-dev am: 12d6101d am: 3e8ed071 am: 610dc5db -s ours" into tm-qpr-dev-plus-aosp am: 5abc38f5 -s ours

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

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



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