Merge "Do not send new Intent to non-exported activity when navigateUpTo" into tm-dev am: 12d6101d26 am: 3e8ed07107

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

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