Merge "Add null checking to two protectFromVpn calls"
am: 335d482d9d

Change-Id: I89afe81145a933a668503ca275308ff668fee169