Merge changes from topic "am-472159aba1454fdeb5b78cdc28a0115f" into tm-qpr-dev-plus-aosp

* 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: 9fd3c6f7 -s ours am: 8dcf8376 -s ours am: ab3967b2 -s ours am: 756426c8 -s ours am: e0801bc6 -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: ea1b5687 -s ours am: 011c642e -s ours am: 6a929ac6 -s ours am: ddfe2636 -s ours am: ebb81388 -s ours