Merge "Do not send new Intent to non-exported activity when navigateUpTo" into...

Merge "Do not send new Intent to non-exported activity when navigateUpTo" into tm-qpr-dev am: df4e467f

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



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