Merge "Add None into cancelPendingUssd" into oreo-vts-dev am: 4ccc3b0140
am: efebbbeeea

Change-Id: I3d144dbf390dbccf3687b037be9b7b88010c7fbd