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

Change-Id: I9b54f0d11f9150f22ad79daaa4b32b551ee1e763