[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978d am: b302dca7 -s ours

am skip reason: subject contains skip directive

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



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