[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into sc-dev am: 860327234e -s ours am: 753f094d4f -s ours

am skip reason: subject contains skip directive

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

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