[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours am: 192f2e6360 -s ours am: 201e93d899 -s ours am: e16f53a4f4 -s ours am: 9fd3c6f739 -s ours am: 8dcf8376e0 -s ours am: ab3967b202 -s ours am: 756426c8aa -s ours

am skip reason: subject contains skip directive

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

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