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

Change-Id: Ia62e2a8ae1e8975ef33203142a4ebe20b45d60b9