Merge "[Passpoint] Remove throws IllegalStateException form getUniqueId API"