Merge changes from topic "am-d7c4e9d21e01422fb3295b680076acc3"

* changes:
  [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: 8ddfb724 -s ours am: f936e56d -s ours am: 7e95cb80 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a93406 am: 53c6a79c -s ours am: b38b3eac -s ours am: 7ca38bea -s ours am: 2f75f308 -s ours am: 2f8a15c0 -s ours am: 0a8fd8ad -s ours am: 6e52c5cf -s ours