Fix NullPointerException for baseActivity

* We are using base intent because baseActivity which can be null in
rare cases, add null  check to avoid the crash.
* This is manually CP'd from http://pa/2771550

Bug: 331118994
Test: run auto Test
Change-Id: I8a1bc98f1b53292266184f9f1e78def28c0e795f