[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: 192f2e63 -s ours am: 201e93d8 -s ours am: e16f53a4 -s ours

am skip reason: subject contains skip directive

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



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