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

Change-Id: Iad35b1764095d6b4bdd52dfd8f8e6a73940bfab5