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

Change-Id: Ie4fa81b5df618862c3af5b8836c059a348e9cb65