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: 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: e0801bc684 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours am: 7ca38bea98 -s ours am: 2f75f308be -s ours am: ea1b568787 -s ours am: 011c642e50 -s ours am: 6a929ac60f -s ours am: ddfe26363b -s ours am: ebb813884f -s ours